ota: fix potential network error by checking return values #4054
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I don't know how to check this. I don't really understand the involved code. |
earlephilhower
added
the
merge-conflict
earlephilhower
removed
the
merge-conflict
| @@ -307,7 +307,7 @@ void ArduinoOTAClass::_runUpdate() { | |||
| int waited = 1000; | |||
| while (!client.available() && waited--) | |||
There was a problem hiding this comment.
This should be a PolledTimeout, now that they exist...
cores/esp8266/Updater.h
Outdated
| // load exactly one _bufSize before flashing it | ||
| // (the last one may be smaller) | ||
| size_t wantedBufSize = remaining() < _bufferSize? | ||
| remaining(): |
There was a problem hiding this comment.
Kind of odd multiline trinary. Style related only. Logic seems fine.
| size_t readThisTime = 0; | ||
|
|
||
| while (data.available() && _bufferLen < wantedBufSize) { | ||
| size_t got = data.read(_buffer + _bufferLen, wantedBufSize - _bufferLen); |
There was a problem hiding this comment.
Do we need to check for if (!got) return fail; due to something weird on the connection side?
There was a problem hiding this comment.
Semantic ensures data.read()>0 because data.available() is true, but adding a test just in case.
There is no constraint on number of bytes read, nor duration / timeout.
This was referenced May 17, 2021
|
superseded by #6369 |
No Sign up for free
to join this conversation on GitHub.
Already have an account?
No Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This needs further testing and is not needed for 2.4.0.